Nano and fixes