please have mercy on my soul... that is to say; I have finally merged the master into my branch... it was ugly and unskilled, and I don't think I really learned as much as I should have... oh well.