m + optimisations

Signed-off-by: Mattias Andrée <maandree@operamail.com>
m

Signed-off-by: Mattias Andrée <maandree@operamail.com>