Johannes improvements

Various improvement suggestions