bug fixes, website validating, moved website functions