Just pushed fixes for all your most recent feedback. give it a go