Addressed some comments and reordered some patches

/Tomas