merged files into one js, commented, added some stuff