sprites modded
presentatational some bug fixes
fix merge conflict