Fix for line break character and other errors

Updating the app layer to better handle the data.