Big update of various changes