exceptionally used my brain and fixed some stuff