Added mostly fixed source-code