CP works when cleaning tabs, small fixes