Fixed some errors
Added subject addition facilities