i backported a few features from beta.wasteof.money :)