made a bunch of changes
	added a street model