cleaned up further, upgraded the version to the latest.