Title fix + more small fixes