Lotsa really badly needed bug fixes...