BUILD 2-1

Just a version including all the stuff Ryan fixed last night.