Updated some meta-data and removed references to Constats.java fill values.
Fixed merge issues