Cleaning some things up; generally improving & making more responsive