more changes ! mainly js