Updates, cleanup of init and bashrc