some minor rearrangements+ database updates
i think we're missing something very important.