Made some minor changes and fixes