Replaced the home dir projectwise instead of hacking too much
some fixes