Version 0.5.2, attempt to fix minor bugs