some small fixes here and there