fixed some clumsy typing