fixed all but constDec, commented