Various fixes and improvements.
Now with stronger pill.