should fix linking and formatting problems