Fixed Issues & added comments