Bugfix in subtyping, added joins + meets of types