wip : updates working and trying to fix bugs