Better exception handling. Formatting. Copyright update.