fixes for more beautifulness