Updates
Updated the change log
CS fixes