finally up to date

end of merge madness