Removing windows line returns and fixing my broken merge from earlier.