Better(/fixed) task insertion

Addresses #589