Added Error Handling, Formatting