More fixes + additions