adjust default limit and a couple minor markup things