nano fixes, seems to be working ok