Added whitespace handling and more git shortcuts