some tidying. snow.hpp is broken and causes segfaults sometimes...