Almost done, just small fixes left