changed type declarations that were bugged