Fixed 5.3 $this errors
Updated docblocks