Improved stubbing and comments
1.1.2