Fix and optimize null cell handler
Optimize ice cave map