fixes and some working links