removed orphan code, some minor fixes. updated package version.