Fixed plurals
Got improved subtyping working
more subtyping fixes