Some fixes with minor mistakes ...