Added folding options
Fixing issues