Andrew s/fix func minor

Deleted (tr) fix some bugs.