Pr changes, property attributes, helper methods, awakeFromNib fixes,