FIX: all bugs. ADD: budget types/...