many bug fixes in results