General Update
general fixes