squished some bugs