1.3

Removed redundant code, added forgotten features for paint