added snake, etc.
merge with master