tweaks to types and var name
commented key fix for next pull request