Added metrics + fixes
Updated updater ^^