Updated minor errors, labels etc