Added some macros and reorganied bashrc