clean up + linking stuff up...