cleaned up a little
added some options