Fixed a couple of bugs, but more to go...