More fixes, now it works out of the bos