Backup with bug fixes and some comments