This currently passes test-t-bad.sh (passes some cases because of bad error handling though)
Removing extraneous functions
Updating the README