Update behavior based on #198 disscussion, also fixes minor bugs