Some fixes..  and the project is completely finished.