added versions to everything. clean up.