fixed silly bugs and styled a bit