Some additional minor changes, deleted unnecessary stuff