Bugfixes and more work on website