fixed some issues with & and &amp;