updates to latest
More fixes for broken shit