Some minnor updates