some fixes + additions