Added bot class, misc other changes