fixes and backup