Quick & dirty updates (to be more usable)