Minor fixes and updates
Updated version