Cleaned up + fixed versioning.