comments #2 - bugfixing and cleanup

Signed-off-by: Alexander Skjolden <alex@plastboks.net>