some small tweaks for the website
resolved merging conflicts