fixed bugs in no-collapse mode
Fixed some issues with format and options