Add changes based on Milkshake implementations, as well as move TODOs to github issues now that I have internet again.