Don't wrap returned objects in array. Fixed some doc comments.