improving tracking files in storage directory - fixes