Minor improvements - thanks to calle@init.se and claes@init.se!