Applying some fixes, cleaning up, mainly path changes