Small updates and TODOs