Fixed all the auto-archive bugs - I hope