misc fixes + extra hooks for user