made munpack to return Maybe (types) too, cleaned up a little