fixed some things/cleaned things up