update to 0.37, with some minor bugs fixed