Tried fixing the synch issue + some small fixes