push of everything

Cory still needs to fix some things
improvements!

-bug testing code
-slight improvement to UI