Added the onDisable(), and fixed a few NPE's.