more fine tuning of small things, getting ready for adding comments