update master with minor fixes