Implement Check for Update, other fixes