Added some options & comments, cleaned the code...