improved code quality
improved work mode with meld/merge integrated