cleanup, typos...