adding types
Removed some debugging code