Fixed whitespace things and also fixed #1