some test and adjustments