adds watch option to cli
adds base64 support