minor fixes
temp commit/may need a revert