fixes here and there and everywhere.