Almost done, small fixes left