tweak & polish stuff