adding missing options + fix build errors