misc updates
trying to merge
rebuilding