small fixes
snakes
merge