Comments and fixes

Signed-off-by: Jakob Hedman <jakob.hedman+github@gmail.com>