updated some stuff and fixed some stuff