a lot of changes again

we'll call this a re-release