minor fixes
Merge branch 'master' of github.com:miscco/TC_model

	Some minor hickups from merging Tübingen and übeck branch
 	Merging 2 branches...