Improved metrics (added units) and simplified startup script