squash some commits

adjust home directory based on

lint

fix assignment

lint

move block up
fix logical error