some bug fixes, seems to work with one person