manifest fixes and more code initialization