some cleanup, starting to add rsync stuff