Main update

Updated stuff