Some small fixes

Take a look and let me know if you have any questions