Fixes all bugs according table of issues
Fixes all bugs according table of issues