rearranged much and cleaned up stores a bit - still some more to do tonight