updated some files from s7562m branch and some from jonypx09 branch