kai's comments

awesome job! I left some comments inline -- see the 'changed files' tab.