Fix content modification so we don't throw most of it away
Fix broken input field
Add 'one_use_token' feature