fixed minor bugs after merge, spotted new Storm issue, desc in #46