Bugs fixed and add new files