Minor improvements

1 new little method and 1 little modification of existing method.