knockout fixes and modifications