small fixes all around.
fixed up versioning for master. fixes #16