merged files
added a couple of nice aliases