More invoice stuff added