Updating boilerplate with latest deps and new found minor improvements.