Final dev commit. Many updates.