Minor fixes really, this module should be caught up now and workable again. It really needs to start using templates.