various additions
various change