cleanup and fixing some of my stupid bugs