fixed small bug
moved things between bash_profile and bashrc, mainly environment setting