added aliases; changed comments;