tweaks

code tidy up and some expand updates