Updates

Some filtering added, parameter changes, variable changes, and other
functionality within the code.