Fred Carlsen
fix various issues based on feedback #kvistad