Cleaned up, added aliases.