cleanup, and adding finishing touches