Rewrote signs, fixed NPE's on startup