Changed how Masters are identified a bit

(It's a bit borked, will be fixing soon)
Also made a couple other small changes.