More updates fixed getopts