minor update and fixes