Final chages

Made final chnages to soting project