add todos and cleanup broken snippet