* Add render option back
* Fix geometry option