misc constants changes and fixes