Various fixes, including title