recovered stuff

there are still a few bugs to work out