A few changes here and there
Some small changes here and there. Fixing some small bugs