Update

Updates + manual sync with newer upstream files (I know..)