fixes-additions
fixes