removed magic numbers added in fix for #4, also comments to explain, fixes #7 dupe bug