Fixing issues

Not 100% on the trailing spaces as I'm just using the online GitHub editor