Some last changes and files