fixed a few warnings, fixed an xml apostrophe issue