Fixed and added comments