tweeking minor stuff