Bush added. Various organizational and bug fixes.