Some REDIS work + minor changes