added wonderful compact mode
and few small fixes