Removed some old aliases. Also, load correct machine specific files
Many updates