various small changes and some unfinished experimental changes