trailing whitespace, couple more gitaliases