final changes

not done but moving on, may revisit in future