Added some more cases TODO and testing word margins