v1.5.2

Bug fixes and cleanup for easier reading.