aaaaaand bug fixes