a few changes to todo's, before switching back to laptop