Fixed vrarious mistakes in the source / clean the source