misc
a few fixes