Fixed a few things. Getting there...