some showstopper bugs discovered after a day of running :*