Finished personalization on smartcard
minor changes
struggling with merging