moved things around; general updates