Several fixes, development