new challenge, small fixes