Solved bugs caused by the previous refactor. Cleanup of Terrain and Area