Updates to properties * BE SURE TO CHECK THEM AND FIX THEM *