Nicer defconstants and some minor edits