stuff: some more fixes