added header removal
write the actual link
some cleanup