Some clean up and amends to .profile