question fixes
bug fix #26 and #27