Changed hints style (and small quick fixes)