Fixed some errors during testing... need to change xml settings