Old Changes

-- Misc changes from old files