Fixed more strict errors, added more sources