delete-horizontal-space and bug fixes