bugs and cleanup
damnit bing