Yep, I'll be making another pass at this and get those fixes in.