cleaning up various small decorator mistakes and finishing the forum decorator