better includes, bug fixes, version bumps