More work on this dev version

See changelog