added option saving and did a cleanup