latest changes. Almost all done except verify page
Merged