Added version properties, cleaned up some TODOs