fix
merging small fixes