Sick splash and other stylez
merge fix