minor gripes fixed