Cleaned up certain bits, also more allocation.

Got rid of loads of comments already introduced in main.c, that has the
same meaning.