bugs
Merge branch 'storyrobin' of github.com:ging/vish into storyrobin