fixed some typing issues