Still playing around with a couple potential bug fixes