updated some stuff, and moved a bit to Constants