Refined all the strange things first pass , need re-refinement.