fixes. merge w/ line version