some bug fixes in main / sheets