Got aliases working and some cleanup