Updated to 1.5.2 and cleaned up code
Too much to describe