Added more link attributes
Code cleanup, fix PROJECT test 16