Added icecream, minor bugfixes