Simplified links; atx headers implemented