changed over to using XML, fixed some issues