Fix: many fixes, more to go