added a few fixes for make ups