Remove commented out code
Add TaintJ support
Make shift checks optional
Update libs