version maps adjustment, bundle and plugin fixes for builds, bug fixes