squashing some bugs
fix