silly mistakes, hopefully sorted now