fix some ${ARGV} problems, revert some test changes (#7, #8)

unit tests still not working, but there seem to be fewer bugs now