More bugfixes. Calendar needs to be made more user friendly..
Basically working, but need to think about the setup from now on a bit..