final few updates for 0.1