got rid of most of the bugs