fix homedir location, add push simple back since on 7 now