Version 2.1.1

Just some minor fixes on code comments