Core code complete
improving preferences