small fix
other small fixes