Temporarily removed constants, fixed errors.