rmdir() added; removed warnings for #4