cleaned up stuff, moved stuff, preview hints