db column renamed + minor changes