Added better handling for link tag parsing
Added some method header comments