Added some comments
Small bugfix