Corrections, tweaks and additions