ticked done plus some improvements and links