small improvments for mastersalt