added base64 urls and cleaned up a bit