Minor update, bug fixes