fixed build and minor other updates