Prototype 43

minor fixes