fix some bugs in previous submit
added aliases