testing, small fixes