More edits. Lots of try/catches added.