more fixes.. minor stuff