Add quotone and various fixes