Changed cluster icon, optimized code that generates markers and other small fixes