tweaked minor stuff