Working for up to around 8

Fixed some silly mistakes