fixing errors from all the changes ...