some main changes

Conflicts:
	main.cpp