some neatening up and some questions
Merge pull request #1 from tansaku/master

some neatening up and some questions