got rid of some bugs