Fix several issues including adding the select option