organize aliases a bit and add a couple more