fixed a few bugs
fixed another bug + styled a little bit