fixed some type stuff