minor changes that should not have broken anything...