Rearranging some functions
Additional bash config changes