In app fixes and improvements, batch2