Saving extra data + various improvements