put in follower and error checks/minor changes