Added some more constants
Fixed some leftovers from Issue #8