small improvements, testing...