Updates with minor bugfixes related to split-off into seperate project.