merge bs3 + small fix