Minor Updates. Cleaned some things