A bunch of cleanup and fixes

Although I'm still getting a lot of errors w/ my version of selenium