fix up constants, renaming for ugly 2x stuff, retina compiling