Added manifest, some cleanup and updates