Major update

Added lots of new options