more changes
Merge branch 'master' of ssh://github.com/PeterDrake/Language
finished getting rid of all irrelevant warnings