fixes #15; docs updated and cleanup