some neatening up and some questions