updated & implemented some stuff