Small improvements, bases on testing