Finished the project
Small changes in init