various fixes and improvements
new pill