Simplify __array_wrap__ for now, can re-implement optimization later if it is needed
Minor fixes to comments