some bug fixes
bug fixes
a