Added better watching and stringification