replaced literals with constants in some places. migrated some abilities out of headers and into implementation files.