Project completed. P.s. Small fixes