Small tweaks, currently writing date integration for string