couple TODOs and a missing import for plotting