Changing

Added constants, fixed some situations