Still a work in progress, but added and fixed a few things.