change constants to upper case
change constants to upper case
fix bugs