Fix some minor issues
Proceed with RESt, and error handling