updates and fixes + help functions