Overlay bug, and some broken functionality hidden away (not sure what it did, but it doesn't anymore)