some bugs and stuff