checkin code for changing node shapes and some minor issues.