Organized aliases; added new functions