more aliases; cleanup