model aliases
minor changes
Merge