more options added
more options, little cleaner. ugly