Cleaning up a few bugs, started working on scp copy for keys.