refactor cleanup
fixed reg tests.'
WIP fixing specs, fixing repos.