Updated delegate methods, minor changes