Feature ical

Minor bug fixes Miel did