More stuff by Castano Blanco, and fixes