Merging old code to new home

after github audit added bug fixes to another repo - pulling these back now