Bug fixes
Updated manifest