Proper exceptions
fix type-hinting comments