Remove comments from a temporary idea.
Bugfixes (didn't i run the tests??).
Update copyrights, 2014.