1 lab fix

Fixed everything you've mentioned in CR, except for the Observer public protocol (asked a question to related CR).