fix leaking vars; fix location display; cleanup