cleaned up, added options, config file