Development

Several bug fixes, mostly related to non existent and empty files.
Some fixes due to not tracking the main processes anymore.