cleaned, added opptions
cleaned