Minor Update and Bugfixes.