fixed little bugs - missing '.self' in various places