fix bugs in the scamble...