Small changes plus main file