Parameters fixes
Constants added
Almost finished version 1.0: check and test todo