Some last updates and stuff ok ok