Some fixes and first website commit
Merge conflicts