tried squashing some bugs