Update with amoebautils and fix economy operations