Serious play

refinements, bug fixes and play