additional aliases; modified aliases; general cleanup; additional functions;