More method commenting and some bugfixing