Added emoji support, minor fixes