fixed a couple of minor things to get to compile
changed the hints for one exception; added some comments for future additions