Added new properties to editor window, fixed bugs

Also cleaned up some variable names. Spinners suck.