removed some debugging
updated enums for types