Fixed several small bugs

Improved visuals and fixed a few bugs that were lurking.