Fixed bugs, final commit before instancing tiles