Additinal return attributes

and some cleanups