some test and fixes