Added ability to change constants, untested
Added quick printout of constants
Merge branch 'working'