O3 optimizations + roomservice typo fix

Conflicts:
	tools/roomservice.py