Some minor changes, not yet usable