Project cleaned, some bugs removed