Minor Bugfixes and updates.