misc
fixes