added &,<,> to escape characters
cleanup and fixes