major fixes to the initcms bundle