Many basic improvements