More bug fixes
Updated