a few bug fixes
q
q
qqq