lots of changes, getopt for the win
bump