Minor bugs, testing.