fixed all my stuff for now