Minor update & bugfixes