Small changes. Force aliases. Tests passed. Fix #20