fixed some type mistakes