some more skeleton and config tuning