Unit counts now correct, info frame no longer disappears, bugfix

Fixes #21 and part of #17

(easy fix thanks to peterm)