Bugfix and other minor updates.