Added better messages and error handling in a couple of places. Added integration...