Minor bugs

we're getting there