Everithing fixed and reviewed