worked on carbonite, bugfixes