fix various bugs

got rid of all references to ConfigurationHolder
made sure all parts work properly wit the calendar plugin