Clean up a lot of code, and finish teleporters initial implementation