Improved tick count code to include save states

Removed extra semi-colons

Increased save state version and fixed formatting

Removed unnecessary code