tweaked some minor stuff