small quality corrections
uncondensed first full prototype, not including UI
small quality corrections