A few changes

Few ideas, please take them into consideration.