Removing incorrect arguments. Fixing math in split modal.
Re-adding frontend hack.
starting to sort out to and from security
Merge branch 'master' into conversion