Mixed Number and other improvements