typing tweaks. formatting tweaks. Fixes #28