Add fixes for slicing bug, some progess on text