Struct Fields added; also cleanup, remove debug messages.