Updated to 2.1.3 for minor cleanup and better error handling