Mapping improvements + visible cursorline