Updated to 1.5.2, and various other tweaks