Fixes double subject and a few other things