type fixing
minor fixes