updated & added some stuff