Fixes and comments were added