Improve dot reading, add hash-remove.