Fixed a few things... and stuff...

Also eclipse seems to have a bug with Ctrl+Shift+F and project-specific
settings... :/