added comments
fixed merging issue! turns out it was only a couple lines