merged updates with the new code

Benjamin Mako Hill || Want to submit a patch?