archiving bug fixes