add parting shot and some tweaks