bugfixes and added TODOs for Splatterling class