Adding sub context and simple calculator for ux-lamp and comma escaping for genie wish.