Nixing pandas and a few other minor corrections