Added some small things, things need A LOT of fixing