Additions and general code. No version increment.