Update

misc fixes