updated few stuff