more cleanup for function-gen; notes