Bugs cleared and files changes