One step closer to production state. Minor updates.