fixed states issues and floating point numbers