Add image handler, fix timeouts
Little fixes