Updated/upgraded a whole bunch. Got rid of Constant.java...