Started on sales, some namefixes