huge cleanup, and more personnalissaiton