Pulled some updates from website into commit