Little fixes

CAN YOU ADD THESE OPTIONS HERE?