adding hints, other minor fixes