moved base64 and minor fix