Small fixes, should be all working, bar blazr