Added starter xml template, bug fixes.