updated values content and fixed more js stuff