Bug fixes, expand valid os'