Fixing some random changes
Adding some more stuff