owner reassignment + some fixes