More bugfixes

DONT SCREW ANYTHING UP, IT WORKS
Merge remote-tracking branch 'origin/master'

Conflicts:
	main.cpp
	main.exe
	main.o