Added subtitle field, fixed some bugs.