modifications/fixes after use in fresh projects