A bugfix + a small update.