added a few minor update/fixes