Added a completion handler and cleaned up some docs