loads of bugs fixed
also on 587