Fixed all of the constants and crap

That took wayyyy too long, why do I have a job?