fixed bug
edits to comments
removed error
manually merged andy's stuff let's hope it works
fixed merge issue, added settings