Updates
Updated the recommended version constraint
CS fixes