add credits + clean
more adjustments