-changed Styling
-fixed bugs