utils + small fixes + wookmark