Accordion ready, improvements and bug fixes