Some fixes, more TODOs