Fixed Bugs, changed data encoded, made local work