REmoved some commented code
Testing new maps, changed block spacing
Fixed conflicts
Merge