Added more constants, changed description