added small tweeks throughout