added funnies, made final edits, proceed to last db changes