Last minute changes
Merge with some bugfixes
No longer confusing email adresses