Many fixes!