whoops some compiler errors
some more optimizer changes
Merge branch 'master' into optimizer

Conflicts:
	optimizer.cpp