Updated to 1.5.2, cleaned up some code