Minor changes, started thinking about XSS prevention currently totally unsafe