Minor tweaks added. Finished, but may adjust again.