Fixed archiving and added tooltips