Simplified the starting XML and fixed a couple minor bugs.