Committed too fast...

I should read through the code again before committing. It is looking pretty weird at the moment ;) Sorry for the many pull requests