Added debug info and cleaned up constants