Issues fixxed, added comments