finishing up

last minute fixes to code

Signed-off-by: Michael Frohberg <michael.frohberg@gmail.com>