minor improvements
updated spec, sketched out skeleton