base and home edits, code cleanup and consistencies