Bug Fixes so it works on Website!