Fixed errors, updating manager