added the taken lists plus a few other tweaks'
merged and style tweaks