removed useless class
improved and fixed some errors
added tests
added convenience methods for Span