more work towards end state
small tweaks