deactivating folds + other minor syntax improvements