minor changes from home (master w/ be the personal branch from now on)