Moved stores into context.
Little tweaks.