Add better memwipes where available

Also revise the TODO