Refactors, fixes, trying to make the snake handling more repsonive