various fixes. will note in issues