small updtaes and bug fixes