Mostly Improvements

Setting the number to add doesn't work yet.