Adding a TODO list of improvements which could be made (after having tried these out).