bug review fixes