hopefully fixed some stuff