Improved Save and added htmlText