Added some more comments to database and implemented nested tokens within <text> token