cirrected linking, improved code readibility