Fixed self. stuff in the classes