little tweak&debug