fixed more constatns
more constant and data type fixes