wtf am i doing
fixing some issues