Fixing bugs and adding more options