code fixes and insertions
code tweaks, formatting
Code fixes/Tweeks