Fixed Cellar file reading bug and small others