Improved constants names, more debug options added.