go fmt
Added more error logging
Minor edits