fixes and addition of constants
resolve