fix semi-colons to keep code style
add deferred support for count. closes #41