Some small bugfix + optims + general timeline