cleanup and always update timestamp for index
fix for #21