some updates before major push