further fixes for lasers