more testings and fixes