Minor update, tweaks and fixes