better config, small fixes