Finishing for master thesis.
* Repairing last reported BUGs.
* Improved indirect dependency handling and reference reloading