Added Import timeouts, cleaned up directory listings