Multiple small fixes made, not ready for prime time ....