TODO updates

Remove some done things, sort/reorganise