Forgot a few constants

Added more constants (removed magic numbers)