Bug fixing, adding more options
Clean up