tweeked some things