Cleaned up folder plus balance fix