fixes here and there :)