More junk in the trunk clean up and Spelunk
Some changes to fix random restarts

Conflicts:
	block/elevator.c