bringing everything up to current (spec-ready) version