code review
chnage menu
Merge pull request #2 from ahilles107/master

Review, and some fixes