went through everything and did some cleanup and fixing