added snake removal, bugfixes, refactoring