Fixed other direct sources, source is almost ready for compilation